Skip to content

Conversation

Zalathar
Copy link
Contributor

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Zalathar and others added 10 commits September 10, 2024 16:08
…arsan68

bootstrap: Print more debug info when `find_initial_libdir` fails

From looking at the failure messages printed by rust-lang#129775, my hypothesis is that `rustc --print=sysroot` sometimes prints the wrong path when the rustc executable is hardlinked in multiple places, at least on my macOS system.

However, currently I don't have any concrete evidence of this actually happening. This PR therefore expands on rust-lang#129775 by printing even more information on failure (including the actual rustc path), in the hope that when the failure next occurs we can confirm or reject the hypothesis that `rustc --print=sysroot` is printing the wrong path.
Don't call closure_by_move_body_def_id on FnOnce async closures in MIR validation

Refactors the check in rust-lang#129847 to not unncessarily call the `closure_by_move_body_def_id` query for async closures that don't *need* a by-move body.

Fixes rust-lang#130167
…bzol

add llvm-bitcode-linker and llvm-tools bins to ci-rustc's sysroot

rust-lang#130040 is [reverted](rust-lang#130292) because adding component binaries directly to the dist tarball of the compiler caused conflicts (see rust-lang#130291 and rust-lang/rustup#4019). This PR solves the original problem without touching the dist tarball.

r? Kobzol
…-in-tests, r=Kobzol

avoid updating LLVM submodule during bootstrap unit tests

To test this, make sure you don't have `src/llvm-project` fetched and then set `llvm.download-ci-llvm=true` and run `x test bootstrap`.
`ProjectionElem` and `UnOp`/`BinOp` dont need to be `PartialOrd`/`Ord`

These types don't really admit a natural ordering and no code seems to rely on it, so let's remove it.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 14, 2024
@Zalathar
Copy link
Contributor Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Sep 14, 2024

📌 Commit 89dd3f9 has been approved by Zalathar

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 14, 2024
@bors
Copy link
Collaborator

bors commented Sep 14, 2024

⌛ Testing commit 89dd3f9 with merge b8a071d...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 14, 2024
Rollup of 5 pull requests

Successful merges:

 - rust-lang#130138 (bootstrap: Print more debug info when `find_initial_libdir` fails)
 - rust-lang#130199 (Don't call closure_by_move_body_def_id on FnOnce async closures in MIR validation)
 - rust-lang#130302 (add llvm-bitcode-linker and llvm-tools bins to ci-rustc's sysroot)
 - rust-lang#130306 (avoid updating LLVM submodule during bootstrap unit tests)
 - rust-lang#130317 (`ProjectionElem` and `UnOp`/`BinOp` dont need to be `PartialOrd`/`Ord`)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-ext2 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] miri test:false 4.447
error: failed to remove file `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe`

Caused by:
  Access is denied. (os error 5)
Command has failed. Rerun with -v to see more details.
  local time: Sat, Sep 14, 2024  3:48:36 AM
  network time: Sat, 14 Sep 2024 03:48:36 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@bors
Copy link
Collaborator

bors commented Sep 14, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 14, 2024
@Zalathar
Copy link
Contributor Author

@bors retry (failed to delete miri)

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 14, 2024
@bors
Copy link
Collaborator

bors commented Sep 14, 2024

⌛ Testing commit 89dd3f9 with merge 4a47e8e...

@bors
Copy link
Collaborator

bors commented Sep 14, 2024

☀️ Test successful - checks-actions
Approved by: Zalathar
Pushing 4a47e8e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 14, 2024
@bors bors merged commit 4a47e8e into rust-lang:master Sep 14, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 14, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#130138 bootstrap: Print more debug info when find_initial_libdir e2f50c2ffc9fda088c3fefd584b1a2ab34da32ef (link)
#130199 Don't call closure_by_move_body_def_id on FnOnce async clos… 5e40769f9c0c0220e2491e57481cf9b6302c6074 (link)
#130302 add llvm-bitcode-linker and llvm-tools bins to ci-rustc's s… c6224c69468f04c7e773816e172f75879e4fbf0d (link)
#130306 avoid updating LLVM submodule during bootstrap unit tests cbd352371b538ce99cf0f112d267461ccd6a5275 (link)
#130317 ProjectionElem and UnOp/BinOp dont need to be `Partia… 69f4a03e3e4645d4ed7a6924b576be19446b44e0 (link)

previous master: 23b04c0513

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@Zalathar Zalathar deleted the rollup-eq0qvvy branch September 14, 2024 07:08
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4a47e8e): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary 3.2%, secondary -3.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
3.2% [3.2%, 3.2%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.9% [-4.1%, -3.7%] 2
All ❌✅ (primary) 3.2% [3.2%, 3.2%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 756.265s -> 758.501s (0.30%)
Artifact size: 341.19 MiB -> 341.18 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants